-
-
Notifications
You must be signed in to change notification settings - Fork 693
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Devender18/refactor organization dashboard 2513 #2591
Devender18/refactor organization dashboard 2513 #2591
Conversation
Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oesFoundation#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…dation#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…dation#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* added docker check to workflow * made recommended changes to docker check in workflow * added changes to docker check inn workflow as recommended * added changes * updated indentation in pull-request.yml file * updated indentation in pull-request.yml file * added Dockerfile and Docker-compose.yml file * added Dockerfile and Docker-compose.yml file * updated .docker-ignore file * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * properly formatted code * trying to make docker check pass * trying to make docker check pass * updated INSTALLATION.md * updated INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * updated docker workflow * updated INSTALLATION.md
* Updated pr template with checklist * Additional changes for the PR template * Changed the url for the PR template
* Update pull-request.yml * update the @mui/x-date-pickers (#2439) * chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update pull-request.yml * update the @mui/x-date-pickers --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <[email protected]> * Update dependabot.yaml * chore(deps): bump @pdfme/generator from 5.1.7 to 5.2.3 (#2440) Bumps [@pdfme/generator](https://github.com/pdfme/pdfme) from 5.1.7 to 5.2.3. - [Release notes](https://github.com/pdfme/pdfme/releases) - [Changelog](https://github.com/pdfme/pdfme/blob/main/RELEASE.md) - [Commits](https://github.com/pdfme/pdfme/compare/5.1.7...5.2.3) --- updated-dependencies: - dependency-name: "@pdfme/generator" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/node from 22.5.4 to 22.9.0 (#2441) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 22.5.4 to 22.9.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @babel/preset-env from 7.25.4 to 7.26.0 (#2443) Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.25.4 to 7.26.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @vitejs/plugin-react from 4.3.2 to 4.3.3 (#2442) Bumps [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/vitejs/vite-plugin-react/releases) - [Changelog](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-react/commits/v4.3.3/packages/plugin-react) --- updated-dependencies: - dependency-name: "@vitejs/plugin-react" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Docker 1 (#2445) * added docker check to workflow * made recommended changes to docker check in workflow * added changes to docker check inn workflow as recommended * added changes * updated indentation in pull-request.yml file * updated indentation in pull-request.yml file * added Dockerfile and Docker-compose.yml file * added Dockerfile and Docker-compose.yml file * updated .docker-ignore file * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * added recommended changes by code rabbit * properly formatted code * chore(deps): bump sass from 1.80.6 to 1.80.7 (#2433) Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.80.7. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.80.7) --- updated-dependencies: - dependency-name: sass dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump eslint-plugin-import from 2.30.0 to 2.31.0 (#2434) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.30.0 to 2.31.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.30.0...v2.31.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @mui/x-charts from 7.22.1 to 7.22.2 (#2435) Bumps [@mui/x-charts](https://github.com/mui/mui-x/tree/HEAD/packages/x-charts) from 7.22.1 to 7.22.2. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/v7.22.2/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v7.22.2/packages/x-charts) --- updated-dependencies: - dependency-name: "@mui/x-charts" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @types/react from 18.3.3 to 18.3.12 (#2436) Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.3.3 to 18.3.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react) --- updated-dependencies: - dependency-name: "@types/react" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update pull-request.yml * trying to make docker check pass * trying to make docker check pass * updated INSTALLATION.md * updated INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * added recommended changes to INSTALLATION.md * Update dependabot.yaml * updated docker workflow * updated INSTALLATION.md --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Peter Harrison <[email protected]> * ADMIN: Updated all GitHub Actions to the latest versions in the `develop-postres` branch (#2449) * updated pr template for develop-postgress branch (#2458) * Added GitHub PR Workflow Check: Talawa Admin app starts (No Docker) (#2452) * Updated branching strategy * Removed duplicate entry * Updated contributing.md * Added extra markdown styling to contribute.md * Bump dns-packet from 1.3.1 to 1.3.4 Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] <[email protected]> * Update pull_request_template.md * disabled CodeQL cron jobs and push actions (#72) * Merge Develop into Main (#1099) * Update authorized-changes-detection.yml * Code Coverage @ 87.1% * Update .gitignore * Delete codecov This executable should not be in the repo * added translation hint text in placeholders (#487) * Update pull-requests.yml * Create DOCUMENTATION.md * Rename issue-guidelines.md to ISSUE_GUIDELINES.md * Update CONTRIBUTING.md * Update issue.yml * Rename PR-guidelines.md to PR_GUIDELINES.md * Update CONTRIBUTING.md * Update pull-request-target.yml * Delete PULL_REQUEST_TEMPLATE.md * Delete ISSUE_TEMPLATE.md * Rename Code_Style.md to CODE_STYLE.md * added removeMember mutation (#491) * added removeMember mutation * changed mutation name * remove contributions from router (#502) * Fixed Settings page Header (#501) * fixed cani-use lite warning * fixed the alignments for smaller screens and also added spacing on places where it was needed * fixed the linting errors * ran prettier to remove styling errors * made the orgSetting title dynamic * linted the code and made the settings header as required and also made the settings page navbar responsive * linted code and made necessary changes * errors fixed * Added dropdown for Applanguage in UserUpdation form (#498) * Added dropdown for Applanguage in UserUpdation form * App language code changed to Default language * Change the Scalar Types [Provides relevant client side changes for #1085 in Talawa-API] (#500) * Change typedefs * Fix date parsing * Move ID to ObjectID scalar * Client changes for Adding GraphQL Scalars (#511) * Change typedefs * Fix date parsing * Move ID to ObjectID scalar * Revert ObjectID to ID * Change ObjectID to ID * modal closed after organization creation (#516) * most recently added Org displays at the top (#515) * Add Husky (#520) * updated contributing (#521) * Display and choose Organisation image (#512) * upload image working for createOrganisation * Organisation image showing everywhere * Testcase failure fixed * Linting fixed * convertToBase64 func made and tests for it * CI/CD error fixed * tests added for AdminNavbar & OrganisationDashboard * Linting fixed * fixed translation on the plugin tab (#510) * added OrgName to the Navbar (#525) * Fix create event mutation [Fixes part of #1101 in Talawa-API] (#523) * Add format fix * Fix updation of posts * Test coverage improved for organizationPeople.tsx (#526) * Update INSTALLATION.md * Update INSTALLATION.md * Update INSTALLATION.md * Update stale.yml * Remove tags (#532) * Fixed navbar added tests (#534) * Fixed navbar added tests * Fixed the translation of All orgnaizations btn in AdminNavbar * Fix the updateOrg page, and made it to create mutation request [Fixes #531] (#536) * fix orgUpdate system * fix translations * Update CONTRIBUTING.md * Code Coverage @ 88% * Fixes #478 : Implemeneted calendar to the Event tab (#537) * calendar-implemented * calendar-implemented * fixed tests * Added post-merge hook using husky (#541) * Added post-merge hook using husky * made required changes to installation.md * make changes to documentation for husky * made the required changes in installation guide * Update pull-requests.yml * Fixed yarn installation instructions (#584) * organization sorting for all organization (#619) * removed redundant notification (#577) * Profile Page for Members (#543) * Initial member page made * Changed query added Org and Events section * Homescreen ready * initial translation added for Profile * initial translation added for Profile * Added translations * Added translations * Revised translation * Fixed failing tests for components * Link added to OrgAdminListCard * Linting fixed for OrgPeopleListCard * Added tests, removed logs * Uniform design * Fix:routing issue for orgdash page (#580) * Fix:routing issue for orgdash page * fix:failing test of SuperDashListCard * Rectify Warnings: EventListCard.test.tsx (#595) * Added logic to close modal after successful submission (#623) * Feature Request: Position of the search bar. (#631) * Feature Request: Position of the search bar #614 resolved * Feature Request: Position of the search bar #614 resolved * fixes: #550 added test for the calendar (#552) * added test for the calendar * updates mocks * Update Router Function [Fixes #636] (#638) * Update Router Function * Empty commit * Fix about content overflow (#632) Signed-off-by: Ekene Nwobodo <[email protected]> * removed duplicate rows per page section in orgposts (#648) * fixed :made card in organization dashboard interactive (#620) * Implemented manage functionality for admin and super admin after login (#539) * Implememnted manage functinality for admin/superadmin after login * Update AdminDashListCard.module.css * Some formatting issues with module file * resolved workflow issues * Added folding feature to posts (#581) * added folding feature to posts * added fold feature to posts * brought code under code coverage * added tests * added tests for remainging uncovered lines * brought code coverage to 100% for the changes * Code coverage @87.2% * Fix User Update Details Page and Add Update Password Page [Fixes #530] (#657) * fixed updateuser logic * update translations * fix lint * lint fix 2 * fix tests * fixed:move orgLocation & remove duplicate orgName (#655) * fixed:move orgLocation & remove duplicate orgName * Dummy commit * fixes - [#597] - Navbar navlinks hover and button styles (#603) * fixed: #585 - Password error showing. Tested * fix: #590 - fixed navbar hover issues * fix: #590 - fixed navbar hover issues * Code Coverage 87.4% * fixes 599 (#653) * fixed errors and removed window.replace * written test case for ensure window.location.replace * written test case for ensure window.location.replace * added useHistory to keep track of routing behind the scenes * fixed merge conflicts and errors * updated comments for file changes * Added warning comments for routing --------- Co-authored-by: Adepeju <adepeju.kayode@gmail> * fix org search location (#682) Signed-off-by: Ekene Nwobodo <[email protected]> * fixed the issue of validate the input before submit #674 (#678) * Adds required tests for OrganizationEvents.tsx and Fixes a minor bug in Calendar (#527) * adds tests for organization events * removes the unrequired branch from OrganizationEvents.tsx * fixes failing tests * fixes failing lint tests * Update password preview feature with coverage tests (#629) * Fix to the issue #585 (#607) * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [feat]-added test cases for password error warning * [feat]- added test cases for password error warning * [feat]- added test cases for password error warning * [fix]- fixed the linting * Improve test coverage for calendar.tsx (#679) * Improve test coverage for calendar.tsx * Restore previous tests * remove --coverage * i rebased my codebase and resolved the initial issue (#669) * fixed the issue use of toast in place of window.alert #645 (#687) * Update ISSUE_GUIDELINES.md * fixed the static time data under Organization card in the Organization List tab (#689) * fixed the static time in org card * formatted the date to MM D, YYYY --------- Co-authored-by: thesaaddevloper <[email protected]> * Fixed the pagination alignment issue (#702) * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]- fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [fix]-fixed the password error warning * [feat]-added test cases for password error warning * [feat]- added test cases for password error warning * [feat]- added test cases for password error warning * [fix]- fixed the linting * [fix]- fixed the pagination alignment issue * [fix]- fixed the pagination alignment issue * [fix]- fixed the pagination alignment issue * Removed overlapping (#675) * changes input element to textarea and changes in test (#710) * Code Coverage @90.7% * Indicating active tabs (#691) * added underline to active links in navbar * fixed lint error * fixed the org default image #688 and removed stock image (#695) * fixed the org default image #688 and removed stock image * removed eslint warning * added new img as default org img * Update INSTALLATION.md * Added Clear Error and Warn Messages when API is unavailable (#670) * Added error and warn messages * Added tests & fixed inconsistency in mocks * Lint fix LoginPage * Lint Fix LoginPage.test * minor fix * Minor update to LoginPage * Minor change to LoginPage.test * Replaced toast.warn() with toast.error() * Fixed test accordingly * Lint Fix * Minor fix * Extra edge case handled * code coverage fix * Lint fix * Update LoginPage * Update LoginPage.test * Lint fix * improve test coverage for orgpost.tsx (#718) * Improve test coverage for calendar.tsx * Restore previous tests * remove --coverage * improve test for orgpost.tsx * Implemented Proper Error Handling for all Screens [Fixes: #535] (#731) * Handled error cases for all screens * Some more fixes * Some more fixes * Added StaticMockLink to use Mocks multiple times [Fixes Multiple Issues] (#745) * add StaticMockLink * lint fix * remove showWarning * Added prompt to Register on Login Page (#628) * Add prompt to Login page - Add prompt in other languages: fr, sp, hi, zh. - switch styling of Login Button with Reg Button * format with prettier * fixed event checkboxes to update (#707) * Block/Unblock functionality for only members of the organization (#690) * Implememnted manage functinality for admin/superadmin after login * Update AdminDashListCard.module.css * Some formatting issues with module file * resolved workflow issues * Updated block/unblock page preventing users who are not members of organiztion * Update BlockUser.test.tsx to resolve failing tests Modified the mocks fields according to the corresponding changes in BlockUser.tsx file. * created a reusable postNotFound Component with responsive UI (#717) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList --------- Co-authored-by: thesaaddevloper <[email protected]> * fix: #601 modal responsive width (#621) * added dynamic title to OrgPeople section (#704) * added dynamic title to OrgPeople section * fixed code coverage * fixed code coverage * uncommented the mistakenly added code * Delete er * Updated session timeout notification toast with already existing one (#734) * Added a toast to notify users that session has expired and redirects to the login page * Updated toast notification on session timeout with already existing one * eliminated the use of magic numbers * minor error correction on the timeout minutes --------- Co-authored-by: TheoCathy <[email protected]> * Fixed the empty space in the OrgList (#751) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList * fixed the empty space in orgList * fixed the failing test * removed the unwanted files --------- Co-authored-by: thesaaddevloper <[email protected]> * align navbar items (#755) * align navbar items * replace More with a hamburger icon * replace More with a hamburger icon to fix workflow error * replace More with a hamburger icon to fix workflow error * Fixes: toggle password for registration (#758) * added toggle-password * updated * formatting * added icon for toggle password * Super Admin Dashboard Error When Organizations Absent (#754) * No Organization Warning on OrgList * Minor Fix * Fixed failing tests * Added Warning on Roles and Request Pages * Added Tests for OrgList * Testing Fixes * Added more tests * Added Tests for Roles and Request Pages * Code Coverage @ 91.0% * Add link to dashboard admin card (#760) * image upload made functional (#677) * image upload made functional * lint * fixed failing test * linting * re run test , remove yarn.lock changes * updateUser test cov * OrgPost * rerun tests * Empty commit * reverted last 2 commits changes * re run code cov * update userUpdate * rerun code cov again * revert last commit * Update PR_GUIDELINES.md * Implemented Search bar and the radio buttons in orgPost page that searches both title and text of post (#770) * created a reusable postNotFound Component with responsive UI * run test error solved * added translation to the component and also created the test.tsx for the error component * fixed the failing test and added the postNotFound reusable component for OrgList * fixed the empty space in orgList * fixed the failing test * removed the unwanted files * the one search bar which searches both text and title of post * testing file * orpost file testing * code coverage is increased * fixed the failing test --------- Co-authored-by: thesaaddevloper <[email protected]> Co-authored-by: saadabban76 <�[email protected]> * center org image on mobile (#778) Signed-off-by: Ekene Nwobodo <[email protected]> * removed link for plugin dropdown toggle (#781) * removed link for plugin dropdown toggle * added id * align superadmin nav items and fix failed tests (#766) * changed the handleSearchByName function in searchByName in Roles page (#735) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * removed extra scrollbars (#800) * Recently added Post displays at top (#773) * Recently added Post displays at top * reversed the posts as required in the query * Increased the OrgList Code Coverage (#786) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component --------- Co-authored-by: saadabban76 <�[email protected]> * Modify event visibility for non-admins (#796) * Modify event visibility for non-admins Signed-off-by: Ekene Nwobodo <[email protected]> * Add test suites for events visibilty --------- Signed-off-by: Ekene Nwobodo <[email protected]> * Bug Fix: Drawer menu visibility (#794) * Remove filter by event field (#807) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component * removed the filter by event section in orgPeople's component * fixed the failing test --------- Co-authored-by: saadabban76 <�[email protected]> * Add image to post (#804) * increased the orgList coverage to 95$ * increased the orgList Code Coverage * increased the orgList Code Coverage * increased the orgList Code Coverage * fixed image rendering in orgPost page * increased the code coverage for orgList Component * increased code coverage to 97% in orgList Component * added Image to the post's card * replaced external links with codebase default image * replaced external links with codebase default image * replaced blank image with the default image * fixed the failing test --------- Co-authored-by: saadabban76 <�[email protected]> * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Update pull-request-target.yml * Upgrade Yarn to NPM in Talawa Admin Project (#802) * npm upgrade * remove package lock * Update push.yml * empty * upgrade yarn to npm * fix docs * fix scripts * empty * stop watch mode * fix ymls * empty * fix scripts * empty commit * update scripts * Redirect to dashboard on organization update (#816) * Redirect to dashboard on organization update * Minor Change * Proper Testing Of Pagination In All List Views (#797) * install faker package used for mocks in tests * Test init for pagination * install dependencies needed to implement certain tests * add a data-testid attribute to their markup for use in tests * add data-testid attributes to its markup being referenced from tests * add test to ensure the number of organization displayed on the page corresponds to the option selected from rowsPerPage * add prop to allow rendering of component in test environment * add data-testid attributes to their markup being referenced from tests * add data-testid attributes to its markup being referenced from tests * add test to affirm that the number of persons displayed on the webpage is same with the selected option from rowsPerPage * install dependencies for certain tests * fix lint errors * tests fix * remove unnecessary dependencies * lint fix * tests fix update * restore file to previous state * empty commit * tests fix update * lint fix * Conditional Usage of Google reCAPTCHA [Fixes #798] (#820) * conditonal recaptcha * Update INSTALLATION.md * add tests * fixed the issue of Mismatched passwords validation #722 (#824) * fixed the issue of Mismatched passwords validation #722 * fixed lint code error * Code Coverage @ 92% * Replace Talawa Portal with Talawa Admin Portal #817 (#821) * Update website title to Talawa Admin Portal in en * Update website title in fr json file * Update website title in sp json file * Update website title in zh json file * Update website title in hi json file * Update the test in ListNavbar file * Update the test in LoginPage.test file * Create a function for the tex macher to make test * Fix lint errors in the LandingPage test file * Remove console.log in LandingPage test file * Upgrade to use npm instead of yarn * Delete yarn.lock file * Fix lint errors * Fix lint errors * Update the heading in hi.json file * Remove unused codes * Fix lint error in LanfingPage file * Correct the talawa_portal value in Fr json file * Correct the talawa_portal value in sp json file * Remove anused package in package.json file * Organization Form Redirect Issue Prevents User Navigation, Affecting User Experience. Issue #808 (#815) * addressing issue #808 * finished - requested changes * addressing warning * Added: event preview modal to view event details (#772) * added event preview model * added event preview model * fixed formatting * added test * added test * added test * failing tests * test * tests * Update workflow (#832) * Workflow fix (#833) * Update pull-requests.yml * Update pull-requests.yml * Update pull-requests.yml * Code Coverage @ 91.0% * Feature: Separation of ADMIN and SUPERADMIN functionalities (#826) * Initial changes * Commit to sync repo * Made changes to OrgList * Some fixes * Minor fix * Added tests for OrgList * Added tests for OrgList * Coverage fix * Required changes added * Made changes to OrgList * Some fix * Some fixes * fixes test for OrgList * Some more fixes * Empty commit * Lint fix * Fixed test * Lint fix * Added Whitespace Validation to Organization and Post create forms (#838) * Added whitespace check in Org Create form * Added Tests * Added Empty String check to OrgPost Form * Added Tests for OrgPost * fixed the issue of Toast msg is not available in all languages #740 (#845) * fixed the issue of Toast msg is not available in all languages #740 * format issue * Empty-Commit * Fixed Org Update (#843) * Prevent Admins and Super Admins from downgrading their own roles (#840) * Code Cleanup * Disabled Super Admins from changing their roles * Added Tests * Added more tests * Improved Code Quality * Revert "Fixed Org Update (#843)" (#847) This reverts commit 53c3fef28ef986d63b1eec45663acb7d07cf1b8d. * Fixed Organization Update and Translation (#849) * Fixed Organization Update * Minor Changes * Success message updated * Fail tests on warning [Priority Needed] (#856) * fix warnings Signed-off-by: Ansh Goyal <[email protected]> * fix warnings Signed-off-by: Ansh Goyal <[email protected]> * fix warnings Signed-off-by: Ansh Goyal <[email protected]> * fix warnings Signed-off-by: Ansh Goyal <[email protected]> * fix warnings Signed-off-by: Ansh Goyal <[email protected]> * restore addonregister Signed-off-by: Ansh Goyal <[email protected]> --------- Signed-off-by: Ansh Goyal <[email protected]> * Code duplicacy removed (#852) * Code duplicacy removed * Tests added * Added comments * Fixed failing tests * Code formatted * Unused packages removed, flag icons package updated to latest version (#860) * Unused packages removed, flag icons updated to latest version * Empty commit * Changes in package-lock.json * Fixes #848: limiting mulitple toast (#851) * limiting-toast * added test * Organization People Filters Improved (#855) * Added Filters to Users and Organizations Query * Added Last Name Filter on User, Member and Admin * Added Translation * Fixed Failing Tests * Added Tests for Filters * Fixed Failing Tests * Code Cleanup * Fixed Tests * Added Translation * remove graphql-boost dep (#866) Signed-off-by: Ansh Goyal <[email protected]> * added UserNotFound component to the Roles page and improved the search (#865) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder * changed formatting in locales changed files * removed comments in Roles.tsx * Empty commit * renamed the PostNotFound component and modifiied relevant files * changed Roles.tsx filtering * empty commit * reverted changes in package.json * Improved signupform validations (#828) * Improved signupform validations * updated signup form validation to show all messages at once * improved test coverage for LoginPage * Fixed failing test --------- Co-authored-by: Joyce Malicha <[email protected]> * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 (#867) * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 * added tests for Search Bar in the Organization List Page of SUPERADMIN #827 * Added Tests Previews (#868) * Installed jest-preview * Automatic Setup * Fiixed Failing Test Command * Added Basic CSS * Added PostCSS Module * Fixed MUI Styling * Minor Changes * Added cross-env to support windows * Adaptar for React 17 and CSS Modules Mock * Added Mocked Styles to Tests * Documentatin Updated * Fixed Failing Tests * Minorr change in documentation * Jest is now Dev Dependency * Workflow Test * Jest Module Path Updates * Module Path Tese 2 * Github Workflow Fixed * Removed Legacy Test Command * Added Documentation to Debug Tests * Fixed Documentation * Docs Image Added To Repo * Images Reorganization * Organized Images * Revert "Improved signupform validations (#828)" (#875) This reverts commit 5820dd9ec05256551b48470c8880fcdc05452fda. * Restored SearchBar Test for OrgList Page (#878) * Restored searchBar test * Lint fix * Coverage fix * Lint fix * Some fixes * Some fixes * fixed the issue of Users filter to fetch corresponding Users to Organisation #701 (#853) * fixed the issue of Users filter to fetch corresponding Users to Organisation #701 * removedd uunused variable * fixed failing text * fixed merged issue * fixed lint error * swap variable * Revert "Restored SearchBar Test for OrgList Page (#878)" (#879) This reverts commit 3d39c524d54e81853490d2d8a1f844ce67252365. * Fixed crashing on error in Block/Unblock page (#862) * Website crash fixed * lint fixed * Added tests for empty response from server * More tests added * Rerun tests empty commit * Redirect on error functioning * Fixed failing tests * Testcase and Title added when users not found * Linting fixed * Typo fixed * Fixed failing tests * Linting fixed * Added NotFound component in OrgPeople and changed Roles.tsx (#882) * changed the handleSearchByName function to search using target's value instead of searchByName variable * updated the file Roles.tsx to take care of useState lag * changed tests for suiting searchByName * changed tests for searchByName including backspaces * added tests for paginationList and changing rowsPerPage * added tests to increase coverage in Roles.tsx * changed the package.json file's test command * changed PostNotFound component to be used as a reusable one and added it in Roles section and set languages option in locales folder * changed formatting in locales changed files * removed comments in Roles.tsx * Empty commit * renamed the PostNotFound component and modifiied relevant files * changed Roles.tsx filtering * empty commit * reverted changes in package.json * added NotFound component in OrgPeople, made changes in the locales files and made some changes to Roles too * added NotFound component to OrgPeople, changerd locales files and changed Roles.tsx * minor change * Restored Search-Bar Test for OrgList Page (#880) * Restored searchBar test * Lint fix * Coverage fix * Lint fix * Some fixes * Some fixes * Fixed Org Dashboard Error (#873) * Fixed TypeError * Minor Change * Fixed Tests * Added back logo512 * Fixed auth header getting copied on login (#890) * fix user update (#876) * fix user detials update * remove userType from update-user page * fix failed test for userUpdate.test.tsx * Removed and Replaced Ant Design from the project (#891) * Fixed auth header getting copied on login * Removed/Replaced Ant Design from the project * Fixed failing tests * Removed comment * Add today functionality in calendar (#897) * Update countline.py * Update pull-requests.yml * Updated countlines.py to cover .spec. files (#900) Co-authored-by: Peter Harrison <[email protected]> * fixed the Inability to set user roles for specific organizations #556 (#898) * fixed the Inability to set user roles for specific organizations #556 * added all language translation * Revert "fixed the Inability to set user roles for specific organizations #556 (#898)" (#901) This reverts commit 891d898eb5543116bb9042a6386b5a12e474159c. * Documentation updated, Redundant css files removed (#896) * Doc updated unused files removed * Removed unused css files from setup tests * Added small calendar in the events #887 (#903) * added small clanedar * added small clanedar * fixed Code Coverage: Create tests for OrgSettings.tsx #396 (#905) * remove redundancy from orgPostCard (#906) * Revert "remove redundancy from orgPostCard (#906)" (#910) This reverts commit d5ce4aa27ee241b0687f7db3d6acd1b62339562f. * Block/Unblock Page Improvements (#885) * Added Radio Buttons * Optimized Queries * Optimized Query and Added Last Name Filter * Radio Button Working * Added Translations * Fixed Filter Name * Fixed Debounce * Fixed Asynchronous Debounce * Added Tests * Better Error and Loading State Handline * Fixed Loader * Fixed Loader * Modulrised Mock Data * Minor Change * Fixed Tests * Increase Coverage * User query replaced with OrgMemberConnection * Fixed Tests * Code Coverage Increase * Code Cov * Fixed Translations * Fixed Failing Tests * fix in failing test (#913) * Improve and Standardize Automated Linting Tests (#916) * added linting rules * added linting rules * added linting rules * Rename `data` variables to more readable name [Fixes #829] (#835) * Refactor screens * Update components * Fix test * Fix typecheck errors * Increase test coverage * Merge latest adminUI-Redesign into Develop (#927) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow --------- Co-authored-by: Anwer Sayeed <[email protected]> * Introduces API versioning check in CI/CD (#924) * a random change * husky precommit * one more try * one more try * one more try * one more try * one more try * one more try * second try * removed unwanted deps * removed unwanted deps * resolved the error * updated variable name * rerun test * rerun test * added test to pull.yml * removed push check * resolved conflict * Update stale.yml * Update CONTRIBUTING.md * Merge talawa-user-portal into develop (#935) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Merge latest Admin UI Redesign into Develop (#934) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Customised Bootstrap (#929) * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Assets typo fixed * Typo fix * Merge conflict error fixed --------- Co-authored-by: Anwer Sayeed <[email protected]> * test PR for API versioning check (#932) * testPR * test2 * testing the change * testing it again * test--no-verify * test--no-verify * echo token * test-again * test-again * test * test * read-only * clone * clone * redesigned newsfeed (#939) * Revert "redesigned newsfeed (#939)" (#943) This reverts commit a645eca7cf2ce1335374f48b52335a293e344580. * Make Talawa-Admin mutations in sync with the backend (#946) * Initial change * Redundant Notification removed * Fixed linting and other issues * Tests fixed * Add Home Screen And People Screen along with other components (#940) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Merge AdminUI-Redesign into Develop (#947) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Customised Bootstrap (#929) * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Assets typo fixed * Typo fix * Initial login page work * Merge conflict error fixed * Theming modified and Added Loader over every screen * Fixed UI issue for navbar and login * Fixed production bug * Removed unused variable * Tests fixed * Added Change Language Btn dropdown * Merge conflict fixed, merge latest develop into adminUI-redesign (#938) * Merge latest adminUI-Redesign into Develop (#927) * Updated CODE_STYLE.md * Updated CODE_STYLE.md (#917) * Updated CODE_STYLE.md * Import section update * Upgrade and Migrate from Bootstrap 4 to Bootstrap 5 (#925) * Updated CODE_STYLE.md * Latest Boostrap v5.3.0 & react-bootstrap v2.7.4 installed * Buttons replaced from normal ones to Bootstrap ones * Import section update * Error fixed for Buttons * Language dropdowns and Change language * InputBoxes & Checkboxes fixed and imported from BS * Removed unused package popper.js * Replaced react-modal with Bootstrap one in Login Page * Modals converted to React Bootstrap one * Completely replaced react-modal with react-bootstrap/Modal from the project * Removed react-modal from the project * Removed classbased modal and unused images * Notification navbar migrated * Modal migration * Modal migration * Modal migration done for OrgPostCard * Empty commit to make workflow run * Empty commit to make workflow run * Empty commit to run the workflow --------- Co-authored-by: Anwer Sayeed <[email protected]> * Introduces API versioning check in CI/CD (#924) * a random change * husky precommit * one more try * one more try * one more try * one more try * one more try * one more try * second try * removed unwanted deps * removed unwanted deps * resolved the error * updated variable name * rerun test * rerun test * added test to pull.yml * removed push check * resolved conflict * Sass filed added with documentation * Linting fixed * Fixed the folder structure and naming convention * Update stale.yml * Typo fix * Update CONTRIBUTING.md * Merge talawa-user-portal into develop (#935) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Merge conflict error fixed --------- Co-authored-by: Anwer Sayeed <[email protected]> Co-authored-by: Kanishka Bansode <[email protected]> Co-authored-by: Peter Harrison <[email protected]> Co-authored-by: Noble Mittal <[email protected]> * Random checkout * Design ready for homescreen * Login page 100% code c=coverage * Login page icon adjustment * Added translations * Fixed the failing tests * Revert to older version of loader * Animation added fixed warnings * Fixed accessability * Mutations and Tests foxed * Fixed coloring in UserPortal * Tests fixed and ChangeLanguageDropdown used in UserLoginPage * Linting Fixed --------- Co-authored-by: Anwer Sayeed <[email protected]> Co-authored-by: Kanishka Bansode <[email protected]> Co-authored-by: Peter Harrison <[email protected]> Co-authored-by: Noble Mittal <[email protected]> * Merge latest adminUI-Redesign (#950) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * [Talawa-user-portal] Add Settings and Donate Screen, along with other UI fixes (#953) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add Event Project and Volunteer Management (#961) * Add screens for adding and updating event projects * Add delete operation for event projects and debug update * Remove yarn.lock * Begin testing * Add display of tasks and functionality to add tasks * Add modal for edit task * Add UpdateTaskModal * Add Delete Task Modal and volunteers display * Add test for DeleteEventProjectModal.tsx * Add tests for add and update event project modal * Add screen for managing volunteers * Add option to assign and remove volunteers * Add tests for AddTaskModal.tsx * Add tests for TaskListItem.tsx and DeleteTaskModal.tsx * Complete testing for all Task Modals * Add completed display to tasks * Add tests for event dashboard * Restructure files * Add attendee management modal * Add testing for EventAttendeeModal * Move to 100% testing and wrapper for attendees modal * Add basic checkIn functionality for users * Add testing for CheckIn modals * Introduce the tag generation into the repository * Update linting rule and fix errors * Remove alloted seat and alloted room * Fix testing * Correct some tests * Migrate from attendees to registrants * Migrate Event Project modals to new design * Migrate registrants modals and checkin modals to new design with 100% test coverage * Move task modals to new styles * Move to 100% test coverage * Admin workflow completed with updated package.json (#960) * Merge latest AdminUI Redesign into develop (#956) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * Fixed Default Animation on Organizations Screen * Fixed typo * Loading data from localstorage functional * Fixed name conventions * Fixed typo * UI Fix * Changed screen name * Table Loader added * Added LeftOrg drawer and Organization screen comp to Screens * routesReducer tests fixed * Redundant adminNavbar removed from project * MemberDetail issue fixed * Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images * Fixed failing tests * Fix tests * Fixed warnings * Linting fixes * Linting issues fixed * Achieved 100% code coverage for CollapsibleDropdown * Achieved 100% CC on IconComponent and removed useless imports * Achieved 100% cc for LeftDrawer Component * Achieved 100% CC on SuperAdminScreen Component * Fixed typo * Integrated Event Dashboard * Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed * Removed redundant code * Removed useless imports * Linting fixed * Removed LeftDrawerOrg * Update documentation * copy-docs -to-talawa branch update to develop * removed dependance of code copying from generate segment * Update push.yml (#969) * Update push.yml (#970) * Feature Request: Adding a dialog to go to plugin store after an organization is created by the admin (#951) * Add/ test for OrgPost.tsx * fix: org post back to default * Added Dialog 2 * Updated Dialog UI * Removed Extra code * Updated Plugin store * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * Fix: UI Redesign * fix: merge * fix * Update AddOnStore.tsx * Fixed Merge Errors * Add test: for OrgEntry * Test 3 * fix test 4 * Merge latest AdminUI Redesign into develop (#972) * Initial Organizations screen done * Removed yellow scrollbar * Linting fixed * Replaced images with svgs for logos * Styling done for btnsContainer * Better typechecking and readability * Animated Drawer working * Responsive page ready * OrgCard responsive * Fixed navbar issue and added webkit keyframes * LeftDrawer ready * Translations added * Added shimmer loading effect * Styling issue fixed * Failing tests fixed for OrgList * Removed unused vars * Tests done for LeftDrawer * Succesfully made component without causing any breaking change * 100% Code coverage achieved for Requests Screen * Fix alignment * Roles screen UI done * Role screen fixed with 100% test coverage * Changing screen activeness fixed * Unused vars and Typos fixed * Language support added * Linting and typos fixed * Fixed failing tests for LeftDrawer * Completed tests of AdminDashListCard with 100% code coverage * OrgListCard done * Finalised tests * Requests user search made functional again ! * Fixed loading on refetch and UX on all screens * OrgList failing errors fixed * Fixed all failing tests * Achieved 100% code coverage for OrgList.tsx * Wrote tests and mod LeftDrawer for admins * Minor ui issue fixed * Fixed failing test * UI bug dropdown * Frontend insync with Backend attempt 1 * Introspection fail fix 1 * Introspection error fix 3 * Introspection error fix another attempt * Another attempt * Fixed Default Animation on Organizations Screen * Fixed typo * Loading data from localstorage functional * Fixed name conventions * Fixed typo * UI Fix * Changed screen name * Table Loader added * Added LeftOrg drawer and Organization screen comp to Screens * routesReducer tests fixed * Redundant adminNavbar removed from project * MemberDetail issue fixed * Achieved 100% code coverage for LeftDrawerOrg, Added Empty div in images * Fixed failing tests * Fix tests * Fixed warnings * Linting fixes * Linting issues fixed * Achieved 100% code coverage for CollapsibleDropdown * Achieved 100% CC on IconComponent and removed useless imports * Achieved 100% cc for LeftDrawer Component * Achieved 100% CC on SuperAdminScreen Component * Fixed typo * Integrated Event Dashboard * Failing tests for LeftDrawer LeftDrawerOrg OrgList screen fixed * Removed redundant code * Removed useless imports * Linting fixed * Removed LeftDrawerOrg * Dashboard screen ui almost ready * Org Dash ready * Block/Unblock screen ready * Organization settings page ready * Lang changes * Page refresh on updating org removed * OrgUpdate tests done * OrgUpdate 100% test coverage achieved * OrgSettings Tests done * Organization Dashboard Cards done * Organization Dashboard achieved 100% CC * 100% CC achieved for BlockUser screen * Finalised changes * Small change * Tests fixed * Separate OrgSettings component made * Linting fixed * Formatting fixed * Events screen and Post Comment Modal for Talawa-user-portal (#963) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add events screen without calendar view * Add multilingual support to Events screen * Fix failing tests due to merge * Add Post Comment functionality * Refactor Events tests * Deprecate event registrants from query * Update README.md * Add My Tasks screen and Fix UI bugs [User Portal] (#978) * Create login and register page for user portal * Lint public locales * Create tests for login page components * Add react import in tests * Create organizations screen for user portal * Fix failing tests and lint code * fix failing tests * Add tests for organization screen and componenets * Fix non-null assertions * Fix non-null assertions in organizations test * Fix bootstrap migration changes * Add Home Screen along with other components * Fix failing tests * Add required tests and Offcanvas navbar * Remove unused variables from tests * Sync the Mutations with talawa-api * Add Settings and Donate Screen * Add multilingual support for the screens * Add events screen without calendar view * Add multilingual support to Events screen * Fix failing tests due to merge * Add Post Comment functionality * Refactor Events tests * Deprecate event registrants from query * Add my tasks screen for user portal * Remove unnecessary comments from test files * Add Feedback UI Components to Talawa Admin (#980) * Add feedback component * Add tests for feedback modal * Add handling for empty feedback * Add Average Rating and Reviews component * Add testing for all the added cards * Fix tests and move to 100% coverage * Add bugfix * Add merge function to fix failing tests * Add key definitons * Change merge policy * Add custom merge policy to all the Event Stat tests * remove cache * Migrate to a single query in the parent * Adding Plugin Logic to the Talawa Mobile Web App (#976) * Add/ test for OrgPost.tsx * fix: org post back to default * Added Dialog 2 * Updated Dialog UI * Removed Extra code * Updated Plugin store * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * fix: warnings and solves #951 & #948 * Fix: UI Redesign * fix: merge * fix * Update AddOnStore.tsx * Fixed Merge Errors * Add test: for OrgEntry * Test 3 * fix test 4 * chores: version changes * Add: Initial Websocket setup on talawa mobile web * Add: plugin logic * Add: plugin logic * removed extra * removed extra * Added: Tests * fix * Add Side Navigation to Event Dashboard (#981) * Create left drawer for event dashboard * Add basic styles to the event dashboard * Fix button styling * Add testing * Add testing for the left event drawer * Add 100% line coverage for all components * Increase timeout for tests * Move maximum rating …
WalkthroughThe changes in this pull request introduce various modifications across multiple files, including the addition of a Changes
Assessment against linked issues
Possibly related issues
Possibly related PRs
Suggested labels
Suggested reviewers
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
Our Pull Request Approval ProcessThanks for contributing! Testing Your CodeRemember, your PRs won't be reviewed until these criteria are met:
Our policies make our code better. ReviewersDo not assign reviewers. Our Queue Monitors will review your PR and assign them.
Reviewing Your CodeYour reviewer(s) will have the following roles:
CONTRIBUTING.mdRead our CONTRIBUTING.md file. Most importantly:
Other
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Congratulations on making your first PR! 🎊 If you haven't already, check out our Contributing Guidelines and PR Reporting Guidelines to ensure that you are following our guidelines for contributing and creating PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 13
🧹 Outside diff range and nitpick comments (30)
src/screens/OrganizationEvents/OrganizationEvents.module.css (2)
169-180
: Improve button styling patternsThe button styles have several issues:
- Excessive use of
!important
which makes styles harder to maintain- Duplicate transition properties between buttons
- Similar hover patterns that could be consolidated
Consider refactoring the button styles:
+ .button-base { + padding: 10px; + border-radius: 5px; + font-size: 16px; + font-weight: 600; + cursor: pointer; + transition: transform 0.2s, box-shadow 0.2s, background-color 0.3s; + } .closeButton { + @extend .button-base; color: var(--delete-button-color); background-color: var(--delete-button-bg); - border: white; + border: 1px solid transparent; } .closeButton:hover { color: var(--delete-button-bg); background-color: var(--delete-button-color); - border: white; - !important } .createButton { + @extend .button-base; background-color: var(--create-button-bg); color: var(--create-button-color); - !important }Also applies to: 360-382
Line range hint
241-282
: Optimize loader animation codeThe loader animation has several opportunities for optimization:
- Duplicate keyframes for webkit and standard
- Hardcoded colors in the loader
- Potentially unnecessary vendor prefixes
Consider updating the loader implementation:
.loader { /* ... */ - border-left: 1.1em solid #febc59; + border-left: 1.1em solid var(--loader-color); - -webkit-transform: translateZ(0); - -ms-transform: translateZ(0); transform: translateZ(0); - -webkit-animation: load8 1.1s infinite linear; animation: load8 1.1s infinite linear; } - @-webkit-keyframes load8 { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(360deg); - transform: rotate(360deg); - } - } @keyframes load8 { 0% { - -webkit-transform: rotate(0deg); transform: rotate(0deg); } 100% { - -webkit-transform: rotate(360deg); transform: rotate(360deg); } }src/style/app.module.css (3)
110-147
: Simplify class names for better maintainabilityThe class names like
.btnsContainerBlockAndUnblock
and.btnsBlockBlockAndUnblock
are quite long and specific. Consider simplifying these class names to improve readability and maintainability. Using more generic names or following a consistent naming convention can make the CSS easier to manage.
251-251
: Remove commented-out code for cleaner CSSThe
color
property in the.addButton:hover
class is commented out. If this style is no longer needed, consider removing it to keep the codebase clean and maintainable.
528-534
: Check browser compatibility for 8-digit hex color codesThe
border
property uses an 8-digit hex color code#0000001f
. While this represents a black color with opacity, not all browsers support 8-digit hex codes. Consider usingrgba(0, 0, 0, 0.12)
for better browser compatibility.Apply this diff:
- border: 1px solid #0000001f; + border: 1px solid rgba(0, 0, 0, 0.12);vitest.config.ts (1)
15-15
: Consider including both .spec and .test files in the test patternThe current pattern only includes
.spec
files, but many React projects commonly use both.spec
and.test
extensions.- include: ['src/**/*.spec.{js,jsx,ts,tsx}'], + include: ['src/**/*.{spec,test}.{js,jsx,ts,tsx}'],.github/workflows/codeql-codescan.yml (1)
35-37
: Fix indentation in CodeQL initialization stepThe indentation is inconsistent with the rest of the file.
- name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: + uses: github/codeql-action/init@v3 + with:🧰 Tools
🪛 yamllint (1.35.1)
[warning] 37-37: wrong indentation: expected 11 but found 10
(indentation)
src/components/AddOn/AddOn.spec.tsx (2)
23-37
: Consider enhancing store mock implementationThe current store mock is minimal. Consider adding more specific mock implementations based on what the component actually uses from the store.
vi.mock('state/store', () => ({ store: { - // Mock store configuration if needed + // Add specific state that AddOn component uses getState: vi.fn(() => ({ + // Add relevant state shape here + // Example: user: { isLoggedIn: true } })), subscribe: vi.fn(), dispatch: vi.fn(), }, }));
Line range hint
39-65
: Enhance test coverage with additional scenariosThe current tests cover basic rendering, but consider adding:
- Error scenarios
- Edge cases
- User interaction tests
- Prop validation tests
Example additional test cases:
test('should handle empty/null children prop', () => { const { getByTestId } = render( <MockedProvider addTypename={false} link={link}> <BrowserRouter> <Provider store={store}> <I18nextProvider i18n={i18nForTest}> <AddOn children={null} /> </I18nextProvider> </Provider> </BrowserRouter> </MockedProvider> ); expect(getByTestId('pluginContainer')).toBeInTheDocument(); }); test('should handle user interactions', () => { // Add interaction tests based on component functionality });.github/workflows/pull-request-target.yml (1)
27-41
: Fix trailing whitespace issuesThere are trailing spaces at the end of several lines that should be removed for consistency.
- + - Thanks for contributing! + Thanks for contributing! - + - ### Testing Your Code + ### Testing Your Code - Remember, your PRs won't be reviewed until these criteria are met: + Remember, your PRs won't be reviewed until these criteria are met:🧰 Tools
🪛 yamllint (1.35.1)
[error] 27-27: trailing spaces
(trailing-spaces)
[error] 28-28: trailing spaces
(trailing-spaces)
[error] 29-29: trailing spaces
(trailing-spaces)
[error] 33-33: trailing spaces
(trailing-spaces)
[error] 35-35: trailing spaces
(trailing-spaces)
[error] 40-40: trailing spaces
(trailing-spaces)
src/components/EventCalendar/EventHeader.tsx (1)
Line range hint
1-124
: Consider adding ARIA labels for better accessibilityWhile refactoring the CSS, consider enhancing accessibility further by adding ARIA labels to interactive elements.
- <Button + <Button + aria-label="Search events" className={styles.searchbutton} style={{ marginBottom: '10px' }} > - <Button + <Button + aria-label="Create new event" variant="success" className={styles.createButton} onClick={showInviteModal} data-testid="createEventModalBtn" >src/components/LeftDrawer/LeftDrawer.tsx (2)
66-70
: Move inline styles to CSS moduleWhile the color changes improve accessibility, inline styles should be moved to the CSS module for better maintainability.
-style={{ - backgroundColor: isActive === true ? '#EAEBEF' : '', -}} +className={`${ + isActive === true ? styles.activeButton : '' +}`}Add to CSS module:
.activeButton { background-color: #EAEBEF; }
75-79
: Consider using CSS variables for icon colorsFor consistency with the PR's accessibility goals, consider using CSS variables for icon colors.
fill={ isActive === true - ? 'var(--bs-black)' - : 'var(--bs-secondary)' + ? 'var(--icon-active-color)' + : 'var(--icon-inactive-color)' }src/screens/OrgList/OrgList.module.css (1)
Line range hint
68-89
: Remove duplicate class definitionThe
.sampleOrgSection
class is defined twice. Merge the properties into a single definition..sampleOrgSection { + font-family: Arial, Helvetica, sans-serif; + width: 100%; display: grid; grid-template-columns: repeat(1, 1fr); row-gap: 1em; + justify-content: center; + flex-direction: column; + align-items: center; } .sampleOrgCreationBtn { width: 100%; background-color: transparent; - color: #707070; - border-color: #707070; + color: var(--text-secondary); + border-color: var(--border-secondary); display: flex; justify-content: center; align-items: center; } -/* Remove duplicate definition */ -.sampleOrgSection { - font-family: Arial, Helvetica, sans-serif; - width: 100%; - display: grid; - grid-auto-columns: repeat(1, 1fr); - justify-content: center; - flex-direction: column; - align-items: center; -}package.json (1)
78-80
: Consider consolidating test frameworksThe project now has both Jest and Vitest test configurations. This might lead to confusion about which framework to use for new tests.
Consider:
- Documenting the transition strategy from Jest to Vitest
- Adding a note in the README about which framework to use for new tests
- Planning for complete migration to avoid maintaining two test setups
src/components/Venues/VenueModal.tsx (1)
Line range hint
74-122
: Consider enhancing form validation.While the current validation checks for empty name and invalid capacity, consider adding validation for the maximum length of the name field and implementing proper sanitization for the capacity input.
const handleSubmit = useCallback(async () => { + const MAX_NAME_LENGTH = 100; if (formState.name.trim().length === 0) { toast.error(t('venueTitleError') as string); return; + } else if (formState.name.length > MAX_NAME_LENGTH) { + toast.error(t('venueTitleTooLong') as string); + return; } const capacityNum = parseInt(formState.capacity); - if (isNaN(capacityNum) || capacityNum <= 0) { + if (isNaN(capacityNum) || capacityNum <= 0 || capacityNum > Number.MAX_SAFE_INTEGER) { toast.error(t('venueCapacityError') as string); return; }src/screens/OrganizationVenues/OrganizationVenues.tsx (1)
Line range hint
240-270
: Consider implementing pagination for better performance.The current implementation loads all venues at once, which could impact performance with large datasets. Consider implementing pagination to improve load times and user experience.
Example implementation approach:
// Add pagination state const [page, setPage] = useState(1); const [pageSize] = useState(10); // Update query variables const variables = { orgId, orderBy: sortOrder === 'highest' ? 'capacity_DESC' : 'capacity_ASC', where: { name_starts_with: searchBy === 'name' ? searchTerm : undefined, description_starts_with: searchBy === 'desc' ? searchTerm : undefined, }, skip: (page - 1) * pageSize, first: pageSize };src/screens/OrganizationFunds/FundModal.tsx (1)
Line range hint
91-125
: Consider enhancing form validation.The form submission lacks validation for required fields and input sanitization. Consider adding proper validation before submission.
const createFundHandler = async ( e: ChangeEvent<HTMLFormElement>, ): Promise<void> => { e.preventDefault(); const { fundName, fundRef, isDefault, taxDeductible, isArchived } = formState; + + // Validate required fields + if (!fundName.trim()) { + toast.error(t('fundNameRequired') as string); + return; + } + + // Validate fund reference format if needed + const fundRefPattern = /^[A-Z0-9-]+$/; + if (fundRef && !fundRefPattern.test(fundRef)) { + toast.error(t('invalidFundReference') as string); + return; + } try { await createFund({src/screens/OrganizationFunds/OrganizationFunds.tsx (2)
21-41
: Consider enhancing color contrast for better accessibility.While the current styles provide good focus states, consider adjusting the background colors to ensure sufficient contrast ratios for color-blind users, aligning with the PR's accessibility objectives.
const dataGridStyle = { borderRadius: '20px', - backgroundColor: '#EAEBEF', + backgroundColor: '#FFFFFF', '& .MuiDataGrid-row': { - backgroundColor: '#eff1f7', + backgroundColor: '#F8F9FA', '&:focus-within': { outline: '2px solid #000', outlineOffset: '-2px', }, }, '& .MuiDataGrid-row:hover': { - backgroundColor: '#EAEBEF', + backgroundColor: '#E9ECEF', boxShadow: '0 0 0 1px rgba(0, 0, 0, 0.1)', },
Line range hint
248-274
: Remove remaining inline styles for consistency.For better maintainability, consider moving all inline styles to the global CSS module.
-style={{ marginBottom: '9px' }} +className={`${styles.searchButton} ${styles.searchButtonSpacing}`}src/screens/BlockUser/BlockUser.tsx (1)
Line range hint
192-220
: LGTM! Well-structured container and input styles.The new class naming convention improves clarity and maintainability. Consider applying similar naming patterns across other components for consistency.
src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx (4)
Line range hint
304-304
: Remove console.log statement.Production code should not contain console.log statements.
- console.log('At handle register', formState);
Line range hint
341-352
: Add cleanup for file preview.The file preview could cause memory leaks. Add cleanup when unmounting the component.
+ useEffect(() => { + return () => { + if (formState.advertisementMedia) { + URL.revokeObjectURL(formState.advertisementMedia); + } + }; + }, [formState.advertisementMedia]);
Line range hint
296-297
: Add error handling for file upload.The file upload lacks proper error handling for file size limits and type validation.
const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>): Promise<void> => { const target = e.target as HTMLInputElement; const file = target.files && target.files[0]; if (file) { + const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB + if (file.size > MAX_FILE_SIZE) { + toast.error(t('fileSizeExceeded')); + return; + } + if (!file.type.match(/^(image\/.*|video\/.*)$/)) { + toast.error(t('invalidFileType')); + return; + } const mediaBase64 = await convertToBase64(file); setFormState({ ...formState, advertisementMedia: mediaBase64, }); } };Also applies to: 369-371
Line range hint
91-106
: Use consistent date handling.The component mixes different date handling approaches. Consider using a consistent date utility throughout.
- dayjs(formState.startDate).format('YYYY-MM-DD') + const formatDate = (date: Date): string => dayjs(date).format('YYYY-MM-DD'); + + // Use formatDate consistently + formatDate(formState.startDate)INSTALLATION.md (1)
207-209
: Fix bare URLs in code blocks.URLs should be properly formatted in code blocks and include language specifiers.
-REACT_APP_TALAWA_URL="http://API-IP-ADRESS:4000/graphql/" +```env +REACT_APP_TALAWA_URL="http://API-IP-ADRESS:4000/graphql/" +```Also applies to: 215-217, 223-225
🧰 Tools
🪛 Markdownlint (0.35.0)
208-208: null
Bare URL used(MD034, no-bare-urls)
src/screens/OrganizationDashboard/OrganizationDashboard.tsx (1)
Line range hint
43-43
: Fix component name inconsistency.The component has been renamed to
OrganizationDashboard
following React naming conventions, but the export statement still uses the old nameorganizationDashboard
. This inconsistency should be fixed.Apply this diff to maintain consistency:
-function organizationDashboard(): JSX.Element { +function OrganizationDashboard(): JSX.Element { // ... component code ... } -export default organizationDashboard; +export default OrganizationDashboard;Also applies to: 571-571
src/assets/css/app.css (3)
151-154
: Fix potential Bootstrap variable conflictsThe table header colors are using Bootstrap variables as fallbacks but could cause maintainability issues:
- --table-head-bg: var(--bs-primary, blue); - /* Assuming var(--bs-primary) is defined elsewhere */ - --table-head-color: white; - --table-header-color: var(--bs-greyish-black, black); + /* Use semantic color names with Bootstrap fallbacks */ + --table-head-bg: var(--bs-primary-bg-subtle, var(--bs-primary, #0d6efd)); + --table-head-color: var(--bs-emphasis-color, #212529); + --table-header-color: var(--bs-body-color, #212529);
137-142
: Improve color variable documentation for accessibilityThe color variables need better documentation for accessibility purposes:
+ /* Dropdown Colors - WCAG 2.1 AA Compliant */ --dropdown-border-color: #555555; --dropdown-text-color: #555555; --dropdown-hover-color: #eff1f7; --grey-bg-color: #eaebef; --subtle-blue-grey: #7c9beb; --subtle-blue-grey-hover: #5f7e91;
Consider adding:
- WCAG compliance levels
- Color contrast ratios
- Use cases and accessibility considerations
143-145
: Standardize sizing unitsModal dimensions should use consistent units and follow a scale:
- --modal-width: 670px; - --modal-max-width: 680px; + /* Modal dimensions using rem for better scaling */ + --modal-width: 42rem; /* ~672px */ + --modal-max-width: 43rem; /* ~688px */
📜 Review details
Configuration used: .coderabbit.yaml
Review profile: CHILL
⛔ Files ignored due to path filters (1)
package-lock.json
is excluded by!**/package-lock.json
📒 Files selected for processing (47)
.dockerignore
(1 hunks).eslintignore
(1 hunks).eslintrc.json
(4 hunks).github/dependabot.yaml
(1 hunks).github/pull_request_template.md
(3 hunks).github/workflows/codeql-codescan.yml
(1 hunks).github/workflows/issue.yml
(1 hunks).github/workflows/pull-request-target.yml
(1 hunks).github/workflows/pull-request.yml
(8 hunks).github/workflows/push.yml
(1 hunks).github/workflows/stale.yml
(2 hunks)Dockerfile
(1 hunks)INSTALLATION.md
(8 hunks)config/vite.config.ts
(1 hunks)jest.config.js
(3 hunks)package.json
(5 hunks)src/assets/css/app.css
(1 hunks)src/components/AddOn/AddOn.spec.tsx
(1 hunks)src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx
(4 hunks)src/components/CheckIn/tagTemplate.ts
(1 hunks)src/components/EventCalendar/EventCalendar.module.css
(15 hunks)src/components/EventCalendar/EventHeader.tsx
(2 hunks)src/components/LeftDrawer/LeftDrawer.test.tsx
(3 hunks)src/components/LeftDrawer/LeftDrawer.tsx
(1 hunks)src/components/LoginPortalToggle/LoginPortalToggle.module.css
(1 hunks)src/components/OrgListCard/OrgListCard.module.css
(1 hunks)src/components/Venues/VenueModal.tsx
(3 hunks)src/screens/BlockUser/BlockUser.tsx
(8 hunks)src/screens/LoginPage/LoginPage.module.css
(1 hunks)src/screens/LoginPage/LoginPage.tsx
(4 hunks)src/screens/OrgList/OrgList.module.css
(2 hunks)src/screens/OrgList/OrgList.tsx
(6 hunks)src/screens/OrgPost/OrgPost.tsx
(9 hunks)src/screens/OrganizationActionItems/OrganizationActionItems.tsx
(2 hunks)src/screens/OrganizationDashboard/OrganizationDashboard.module.css
(0 hunks)src/screens/OrganizationDashboard/OrganizationDashboard.tsx
(1 hunks)src/screens/OrganizationEvents/OrganizationEvents.module.css
(9 hunks)src/screens/OrganizationEvents/OrganizationEvents.tsx
(2 hunks)src/screens/OrganizationFunds/FundModal.tsx
(3 hunks)src/screens/OrganizationFunds/OrganizationFunds.tsx
(5 hunks)src/screens/OrganizationTags/OrganizationTags.tsx
(1 hunks)src/screens/OrganizationVenues/OrganizationVenues.tsx
(4 hunks)src/screens/Requests/Requests.module.css
(0 hunks)src/screens/Requests/Requests.tsx
(4 hunks)src/style/app.module.css
(10 hunks)tsconfig.json
(1 hunks)vitest.config.ts
(1 hunks)
💤 Files with no reviewable changes (2)
- src/screens/OrganizationDashboard/OrganizationDashboard.module.css
- src/screens/Requests/Requests.module.css
✅ Files skipped from review due to trivial changes (6)
- .eslintignore
- Dockerfile
- .dockerignore
- src/screens/OrganizationTags/OrganizationTags.tsx
- src/components/CheckIn/tagTemplate.ts
- src/screens/OrganizationEvents/OrganizationEvents.tsx
🧰 Additional context used
📓 Learnings (3)
src/screens/OrganizationFunds/FundModal.tsx (1)
Learnt from: GlenDsza
PR: PalisadoesFoundation/talawa-admin#2064
File: src/screens/OrganizationFunds/OrganizationFunds.tsx:66-72
Timestamp: 2024-11-12T10:40:58.654Z
Learning: Renaming the Enum `Modal` to `ModalState` in the `organizationFunds` component is unnecessary and does not change the functionality.
src/screens/OrganizationFunds/OrganizationFunds.tsx (1)
Learnt from: GlenDsza
PR: PalisadoesFoundation/talawa-admin#2064
File: src/screens/OrganizationFunds/OrganizationFunds.tsx:66-72
Timestamp: 2024-11-12T10:40:58.654Z
Learning: Renaming the Enum `Modal` to `ModalState` in the `organizationFunds` component is unnecessary and does not change the functionality.
src/components/LeftDrawer/LeftDrawer.test.tsx (1)
Learnt from: Doraemon012
PR: PalisadoesFoundation/talawa-admin#1988
File: src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx:282-282
Timestamp: 2024-11-12T10:40:58.654Z
Learning: In the test 'Component should be rendered properly' within 'Testing LeftDrawerOrg component for SUPERADMIN', setting 'SuperAdmin' to false is intentional.
🪛 Markdownlint (0.35.0)
.github/pull_request_template.md
58-58: null
Emphasis used instead of a heading
(MD036, no-emphasis-as-heading)
INSTALLATION.md
208-208: null
Bare URL used
(MD034, no-bare-urls)
216-216: null
Bare URL used
(MD034, no-bare-urls)
224-224: null
Bare URL used
(MD034, no-bare-urls)
210-210: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
218-218: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
226-226: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
236-236: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
244-244: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
300-300: null
Bare URL used
(MD034, no-bare-urls)
308-308: null
Bare URL used
(MD034, no-bare-urls)
292-292: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
302-302: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
334-334: null
Fenced code blocks should have a language specified
(MD040, fenced-code-language)
🪛 Biome (1.9.4)
src/components/EventCalendar/EventCalendar.module.css
[error] 14-14: Unexpected shorthand property margin after margin-bottom
(lint/suspicious/noShorthandPropertyOverrides)
🪛 yamllint (1.35.1)
.github/workflows/codeql-codescan.yml
[warning] 37-37: wrong indentation: expected 11 but found 10
(indentation)
.github/workflows/pull-request.yml
[error] 208-208: trailing spaces
(trailing-spaces)
[error] 230-230: trailing spaces
(trailing-spaces)
.github/workflows/pull-request-target.yml
[error] 27-27: trailing spaces
(trailing-spaces)
[error] 28-28: trailing spaces
(trailing-spaces)
[error] 29-29: trailing spaces
(trailing-spaces)
[error] 33-33: trailing spaces
(trailing-spaces)
[error] 35-35: trailing spaces
(trailing-spaces)
[error] 40-40: trailing spaces
(trailing-spaces)
🪛 actionlint (1.7.4)
.github/workflows/pull-request.yml
380-380: shellcheck reported issue in this script: SC2086:info:3:35: Double quote to prevent globbing and word splitting
(shellcheck)
380-380: shellcheck reported issue in this script: SC2086:info:10:6: Double quote to prevent globbing and word splitting
(shellcheck)
🔇 Additional comments (51)
src/screens/OrganizationEvents/OrganizationEvents.module.css (1)
Line range hint 1-383
: Move styles to global CSS file
According to the PR objectives, all CSS files should be consolidated into src/style/app.module.css
. This file should be merged into the global CSS file.
Please move these styles to src/style/app.module.css
and remove this file. When moving the styles:
- Ensure class names don't conflict with existing ones in the global file
- Group related styles together
- Maintain the same level of specificity to avoid breaking existing styles
Let's verify if there are any other CSS files that need to be consolidated:
src/style/app.module.css (11)
69-69
: Flex value adjustment is appropriate
The change to flex: 3;
in the .input
class will adjust the flex-grow property, allowing the input field to take up more space. This seems intentional and appropriate for the desired layout.
76-79
: Alignment and spacing adjustments enhance layout
The additions of align-items: center;
, gap: 10px;
, and adjusting the margin in the .btnsContainer
class improve the alignment and spacing of the buttons within the container. This enhances the layout and user interface.
102-108
: New .inputField
class added
The .inputField
class is defined with appropriate margin and styling. This addition improves the consistency of input fields across the application.
216-219
: Consistent hover states for .searchButton
The hover state for .searchButton
is correctly defined, ensuring visual feedback when users interact with the button.
221-233
: New .search
class added
The .search
class defines the positioning and styling for the search component. The use of position: absolute;
and other properties appears appropriate for the intended layout.
254-261
: New .modalbtn
class added
The .modalbtn
class includes styling for modal buttons, ensuring consistent appearance across modals.
269-269
: Color assignment in .mainpageright
class
The .mainpageright
class correctly assigns the text color to var(--dropdown-text-color)
, ensuring consistency with the theme.
473-496
: Addition of .custom_table
styles
The new styles for .custom_table
and its child elements improve the appearance and interactivity of tables. The use of hover and focus states enhances user experience.
523-526
: Definition of .listBox
class
The .listBox
class is appropriately defined to manage the layout of list containers.
551-557
: Addition of .notFound
class
The .notFound
class is well-defined to center content vertically and horizontally, which is useful for displaying messages when no data is found.
559-566
: New .cardHeader
class improves layout
The .cardHeader
class adds styling for card headers, enhancing the visual hierarchy and consistency in card components.
.github/dependabot.yaml (1)
15-15
: Verify the target branch for Dependabot updates
The target-branch
has been changed to "develop-postgres"
. Ensure that this is the intended branch for Dependabot to create pull requests against. Changing the target branch affects where dependency updates will be applied.
tsconfig.json (1)
22-22
: Excluding unnecessary files from TypeScript compilation
Adding "exclude": ["node_modules", "dist", "vitest.config.ts"]
helps to prevent TypeScript from scanning unnecessary files and directories, which can improve compilation performance.
src/components/LoginPortalToggle/LoginPortalToggle.module.css (1)
27-27
: Ensure new CSS variables are defined
The background color for .activeLink
and its hover state has been changed to var(--active-button-bg)
and var(--active-hover)
, respectively. Verify that these CSS variables are defined in your global styles to prevent any rendering issues.
Also applies to: 32-32
config/vite.config.ts (1)
26-28
: Verify the development server configuration changes
The server configuration has been updated:
open
is set tofalse
, so the browser will not automatically open when the server starts.host
is set to'0.0.0.0'
, making the dev server accessible over the network.port
is changed to4321
.
Ensure these changes align with your development needs and that exposing the dev server is intentional, as it can have security implications.
.github/workflows/codeql-codescan.yml (1)
35-35
: LGTM! CodeQL action version updates
The upgrade from v2 to v3 for all CodeQL actions is a good improvement that brings the latest features and security updates.
Also applies to: 41-41, 44-44
.github/workflows/push.yml (1)
Line range hint 56-61
: LGTM! Codecov action version update
The upgrade to codecov-action@v5 is appropriate and the configuration looks comprehensive with proper error handling (fail_ci_if_error: false
) and unique report naming.
.github/pull_request_template.md (1)
45-56
: LGTM! Great addition to the PR template
The new checklist sections for CodeRabbit AI Review and Test Coverage will help ensure higher quality contributions by:
- Encouraging developers to address AI review feedback
- Emphasizing the importance of test coverage
jest.config.js (1)
3-14
: LGTM! Test configuration improvements
The changes improve the test configuration by:
- Properly excluding irrelevant files from coverage
- Standardizing test file naming convention
- Adding comprehensive coverage reporting
Also applies to: 20-20, 44-45, 82-83
.github/workflows/issue.yml (1)
29-29
: Verify compatibility with other workflow files
The upgrade to actions/github-script@v7
is good for security and features. However, we should ensure consistency across all workflow files.
.github/workflows/pull-request-target.yml (1)
22-24
: LGTM: Action version upgrade
Good practice to upgrade to the latest stable version of the action.
.eslintrc.json (2)
Line range hint 56-121
: LGTM: Enhanced TypeScript linting rules
Good additions to TypeScript linting rules that will help maintain code quality. The naming conventions are well-structured and clear.
145-146
: LGTM: Style files exclusion
Appropriate addition of ignore patterns for style files, which aligns with the PR's CSS refactoring objectives.
src/components/EventCalendar/EventHeader.tsx (2)
115-115
: Verify color contrast for create button
The create button's styles should be verified for accessibility, particularly for color-blind users.
58-58
: Verify color contrast for search button
Since this PR aims to improve accessibility for color-blind users, ensure that the search button in styles.searchbutton
has sufficient color contrast.
src/screens/LoginPage/LoginPage.module.css (1)
75-86
: Consider potential positioning issues with absolute positioning
The absolute positioning of .email_button
might cause overlay issues with other elements. Consider using relative positioning or flexbox for better maintainability.
.email_button {
- position: absolute;
+ position: relative;
z-index: 10;
- bottom: 0;
- right: 0;
height: 100%;
display: flex;
background-color: var(--search-button-bg);
border-color: var(--search-button-border);
justify-content: center;
align-items: center;
}
package.json (1)
22-22
: Verify compatibility with downgraded @mui/x-date-pickers
The downgrade from ^7.22.1 to ^7.18.0 might introduce compatibility issues with other MUI components.
✅ Verification successful
Based on the search results, I can now generate the final response since I have enough information about the usage of @mui/x-date-pickers in the codebase:
Downgrade to @mui/x-date-pickers 7.18.0 appears safe
The codebase uses only basic DatePicker and TimePicker components with standard props (label, value, onChange, format, timeSteps). No advanced features from versions >7.18.0 are being used. The implementation is consistent across all files:
- EventListCard components
- OrganizationEvents screens
- UserPortal/Events components
- FundCampaign related components
- RecurrenceOptions components
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Check for MUI component usage patterns that might be affected
rg -l "@mui/x-date-pickers" | xargs rg "DatePicker|TimePicker|DateTimePicker" -A 3
Length of output: 48323
src/components/LeftDrawer/LeftDrawer.test.tsx (1)
98-98
: LGTM! Style assertions align with accessibility improvements
The changes from 'text-white' to 'text-black' in button style assertions align with the PR's objective of improving accessibility for color-blind users.
Also applies to: 182-182, 212-212
src/components/EventCalendar/EventCalendar.module.css (1)
5-5
: LGTM! Improved color management with CSS variables
The migration to CSS variables for colors improves maintainability and consistency across the application, supporting the PR's accessibility goals.
Also applies to: 213-216, 288-291
src/components/Venues/VenueModal.tsx (2)
3-3
: LGTM! Style import aligned with global styling approach.
The change to use the global style module aligns with the project's CSS restructuring initiative.
165-165
: LGTM! Consistent button styling.
The button class names have been updated to use standardized classes from the global style module.
Also applies to: 263-263
src/screens/OrganizationVenues/OrganizationVenues.tsx (1)
4-4
: LGTM! Consistent styling approach.
The styling changes align with the global CSS module approach, maintaining consistency across the application.
Also applies to: 150-150, 158-158, 172-172, 208-208, 231-231
src/screens/OrganizationFunds/FundModal.tsx (1)
5-5
: LGTM! Consistent styling approach.
The styling changes align with the global CSS module approach, maintaining consistency across the application.
Also applies to: 176-176, 275-275
src/screens/Requests/Requests.tsx (2)
Line range hint 234-265
: LGTM! Clean style migration for the search section.
The changes successfully migrate component-specific styles to the global CSS module while maintaining functionality and accessibility.
Line range hint 266-350
: LGTM! Table styling properly migrated.
The table section maintains proper semantic structure while adopting the global styles, ensuring consistent appearance across the application.
src/screens/BlockUser/BlockUser.tsx (1)
Line range hint 221-346
: LGTM! Consistent button and dropdown styling.
The changes successfully implement the global styling patterns while maintaining proper accessibility attributes and interactive states.
src/components/Advertisements/core/AdvertisementRegister/AdvertisementRegister.tsx (1)
3-3
: LGTM! Import path updated correctly.
The change to use the global styles from app.module.css
aligns with the PR objective of consolidating CSS files.
.github/workflows/pull-request.yml (2)
Line range hint 98-132
: Good addition of sensitive file patterns.
The expanded list of sensitive file patterns improves security by preventing unauthorized modifications to critical files.
🧰 Tools
🪛 yamllint (1.35.1)
[error] 133-133: trailing spaces
(trailing-spaces)
209-230
: Verify test coverage configuration.
The new test coverage setup with Jest and Vitest needs verification to ensure proper merging of coverage reports.
✅ Verification successful
Let me gather more information about the test coverage configuration to verify if it's properly set up.
Let me check the configuration files to verify the coverage settings.
Test coverage configuration is properly set up
The coverage configuration is correctly implemented:
- Jest is configured to output coverage to
./coverage/jest
with lcov reporter - Vitest is configured to output coverage to
./coverage/vitest
with lcov reporter - lcov-result-merger is properly installed as a dependency
- Coverage directories are properly gitignored
- The GitHub workflow correctly merges the coverage reports from both test runners
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify test coverage configuration
# Check if coverage directories are created and reports are merged correctly
# Test: Check if coverage directories exist and contain reports
ls -la coverage/jest/lcov.info coverage/vitest/lcov.info coverage/lcov.info 2>/dev/null || echo "Coverage files not found"
Length of output: 136
Script:
#!/bin/bash
# Check package.json for test scripts and coverage configuration
cat package.json | jq '.scripts, .jest, .vitest'
# Check for any Jest or Vitest config files
fd -e js -e json -e ts -H "jest.config|vitest.config"
# Check if lcov-result-merger is installed
cat package.json | jq '.dependencies["lcov-result-merger"], .devDependencies["lcov-result-merger"]'
Length of output: 1410
Script:
#!/bin/bash
# Check Jest and Vitest config files for coverage settings
cat jest.config.js
cat vitest.config.ts
# Check if the coverage directories are specified in gitignore
cat .gitignore | grep -i coverage
Length of output: 3381
🧰 Tools
🪛 yamllint (1.35.1)
[error] 230-230: trailing spaces
(trailing-spaces)
src/screens/OrganizationDashboard/OrganizationDashboard.tsx (1)
34-34
: LGTM: Style import updated to use global CSS.
The change aligns with the PR objective to consolidate styles into a global CSS file.
src/screens/OrganizationActionItems/OrganizationActionItems.tsx (2)
369-370
: LGTM: Improved CSS class naming and structure.
The class names are now more semantic and consistent with the global CSS module.
Also applies to: 386-386
390-390
: LGTM: Enhanced responsive layout.
The addition of md:d-flex
improves the responsive behavior of the layout.
src/screens/OrgList/OrgList.tsx (2)
30-30
: LGTM: Consistent style updates.
The changes align with the PR objective to consolidate styles and maintain consistency across components.
Also applies to: 353-353, 368-368, 537-537, 554-554
344-344
: LGTM: Improved input field visibility.
The addition of bg-white
class enhances input field visibility, which supports the PR's accessibility goals.
✅ Verification successful
Let me analyze the CSS context to verify the accessibility implications of adding the bg-white
class.
Based on the context gathered, I can now verify the accessibility implications of adding the bg-white
class to the input field. The codebase shows consistent usage of bg-white
for input fields and form controls across multiple components, and it's paired with appropriate text colors and border styles. The search input in OrgList follows this established pattern for maintaining visual consistency and readability.
LGTM: The white background enhances input field visibility and follows established patterns.
- The
bg-white
class is consistently used across form controls in the codebase - It's paired with appropriate text colors and borders for good contrast
- This change aligns with the application's established input field styling pattern
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for color contrast issues in the CSS
# Look for background colors that might affect accessibility
rg -g '*.css' -A 5 'background|color' src/style/
Length of output: 12657
Script:
#!/bin/bash
# Let's check the component and its parent components to understand the context better
rg -g '*.tsx' -B 3 -A 3 'className=.*bg-white' src/
Length of output: 28876
src/screens/OrgPost/OrgPost.tsx (4)
22-22
: CSS import aligned with global styling approach.
The change to import styles from the global CSS module aligns with the PR objective of consolidating styles for better maintainability.
293-300
: Search input styling follows new design pattern.
The search input and button now use global style classes, which should provide consistent styling and improved accessibility.
Line range hint 313-349
: Dropdown styling consistent with global pattern.
The dropdown components now use the global style classes, ensuring consistent appearance across the application.
375-375
: Button styling unified across components.
All buttons now use consistent global style classes, which improves UI consistency and accessibility.
Also applies to: 417-417, 429-429, 554-565
src/screens/LoginPage/LoginPage.tsx (2)
Line range hint 447-474
: Email input styling follows global pattern.
The email input and visibility toggle buttons now use global style classes, maintaining consistency with other form elements.
Line range hint 510-523
: Authentication button styling unified.
Login and register buttons now use global style classes, ensuring consistent appearance across the authentication flow.
@@ -60,7 +61,7 @@ | |||
font-size: 20px; | |||
margin-bottom: 30px; | |||
padding-bottom: 5px; | |||
border-bottom: 3px solid #31bb6b; | |||
border-bottom: 3px solid #eaebef; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Convert hardcoded colors to CSS variables for better maintainability and accessibility
Several colors are hardcoded throughout the file. To maintain consistency and improve accessibility:
- Move all colors to CSS variables
- Ensure sufficient color contrast ratios for accessibility
Consider replacing hardcoded colors with CSS variables:
:root {
+ --text-color-primary: #707070;
+ --border-color-light: #eaebef;
+ --loader-color: #febc59;
}
.logintitle {
- color: #707070;
+ color: var(--text-color-primary);
/* ... */
- border-bottom: 3px solid #eaebef;
+ border-bottom: 3px solid var(--border-color-light);
}
Also applies to: 75-75, 155-155, 165-165, 200-200
.editButton { | ||
background-color: var(--search-button-bg); | ||
border-color: var(--search-button-border); | ||
color: #555555; | ||
margin-left: 2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Specify units for margin-left
property
The margin-left
property lacks units, which can cause CSS parsing errors. Please specify units such as px
, em
, or rem
.
Apply this diff to fix the issue:
- margin-left: 2;
+ margin-left: 2px;
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
.editButton { | |
background-color: var(--search-button-bg); | |
border-color: var(--search-button-border); | |
color: #555555; | |
margin-left: 2; | |
.editButton { | |
background-color: var(--search-button-bg); | |
border-color: var(--search-button-border); | |
color: #555555; | |
margin-left: 2px; |
exclude: [ | ||
'node_modules', | ||
'dist', | ||
'**/*.{spec,test}.{js,jsx,ts,tsx}', | ||
'coverage/**', | ||
'**/index.{js,ts}', | ||
'**/*.d.ts', | ||
'src/test/**', | ||
'vitest.config.ts', | ||
], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Coverage exclusions need updates to match project structure
The coverage configuration should be adjusted as follows:
- Remove non-existent directory exclusions:
dist
,coverage
, andsrc/test
- Keep the valid exclusions for:
node_modules
- Test files pattern
**/*.{spec,test}.{js,jsx,ts,tsx}
- Index files
**/index.{js,ts}
(confirmed present) - Type declarations
**/*.d.ts
(foundvite-env.d.ts
) vitest.config.ts
🔗 Analysis chain
Verify coverage exclusions against project structure
The coverage exclusions seem comprehensive but let's verify they match the project structure.
Coverage exclusions need adjustment based on project structure
The verification reveals that some excluded directories don't exist (dist
, coverage
, src/test
), while the test file pattern **/*.{spec,test}.{js,jsx,ts,tsx}
correctly matches the extensive test suite found in the project. Let's verify if any index files or type declaration files are present to validate those exclusions.
Let me try one more search for index files with the correct syntax:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify coverage exclusion patterns against actual project structure
# Check for any test files that might be missed
echo "Checking for test files that might be missed:"
fd -e spec.ts -e spec.tsx -e spec.js -e spec.jsx -e test.ts -e test.tsx -e test.js -e test.jsx
# Verify excluded directories exist
echo -e "\nVerifying excluded directories exist:"
for dir in node_modules dist coverage "src/test"; do
if [ -d "$dir" ]; then
echo "✓ $dir exists"
else
echo "⚠ $dir not found"
fi
done
Length of output: 11849
Script:
#!/bin/bash
# Check for index files and type declarations
echo "Checking for index files:"
fd "index.ts" "index.js"
echo -e "\nChecking for type declaration files:"
fd -e d.ts
Length of output: 299
Script:
#!/bin/bash
# Check for index files correctly
echo "Checking for index files:"
fd -e ts -e js '^index'
Length of output: 308
@@ -25,7 +25,7 @@ jobs: | |||
runs-on: ubuntu-latest | |||
|
|||
steps: | |||
- uses: actions/stale@v8 | |||
- uses: actions/stale@v9 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
The upgrade to v9 introduces breaking changes that affect the workflow behavior:
- The action is now stateful, meaning it will resume from where it left off in previous runs when hitting the operations-per-run limit
- The runtime has been updated to Node.js 20
The increased operations-per-run limit (50) is safe as:
- The action now includes rate limit logging
- Performance optimizations have reduced unnecessary API calls
- Current rate limits show sufficient headroom (7081 remaining of 7200)
Recommendations:
- Review the workflow schedule (currently "0 0 * * *") to account for the new stateful behavior
- Consider documenting these changes in the workflow file for future reference
🔗 Analysis chain
Verify compatibility with actions/stale@v9
The changes look reasonable, but let's verify:
- The version upgrade from v8 to v9
- The increased operations-per-run limit
Also applies to: 43-43
Let me try another approach to verify the changes by checking the workflow file and repository documentation.
Let me try one final verification to check the GitHub repository for v9 release information directly from the actions/stale repository.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Check for breaking changes in v9 and verify rate limits
gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/repos/actions/stale/releases/tags/v9 | jq -r '.body'
# Check current rate limit usage
gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/rate_limit
Length of output: 1260
Script:
#!/bin/bash
# Check the stale workflow file content
cat .github/workflows/stale.yml
# Check if there's any documentation about stale configuration
fd README.md | xargs cat
# Look for any other stale-related configuration
fd stale -e yml -e yaml | xargs cat
Length of output: 8537
Script:
#!/bin/bash
# Get the latest releases information from actions/stale repository
gh api \
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
/repos/actions/stale/releases | jq -r '.[0:2] | .[] | "Version: \(.tag_name)\nPublished: \(.published_at)\nChanges:\n\(.body)\n"'
Length of output: 2149
background-color: var(--grey-bg-color) !important; | ||
color: black !important; | ||
border: 1px solid var(--dropdown-border-color); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
🛠️ Refactor suggestion
Consider alternative to !important declarations, CSS variables are properly defined
The CSS variables --grey-bg-color
and --dropdown-border-color
are properly defined in src/assets/css/app.css
, so that part is correct. However, the use of !important
should still be avoided. Instead of using !important
, consider:
- Increasing selector specificity as suggested
- Using more specific selectors that target the exact context
- Reviewing any competing styles that are forcing the use of
!important
-.manageBtn {
+.orgCard .manageBtn {
background-color: var(--grey-bg-color);
color: black;
border: 1px solid var(--dropdown-border-color);
}
🔗 Analysis chain
Avoid using !important declarations
The use of !important
is generally discouraged as it:
- Breaks CSS specificity rules
- Makes styles harder to override when needed
- Indicates potential specificity conflicts
Consider increasing selector specificity instead:
-.manageBtn {
+.orgCard .manageBtn {
background-color: var(--grey-bg-color);
color: black;
border: 1px solid var(--dropdown-border-color);
}
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Verify if the CSS variables are defined in the global CSS file
rg --type css "(:root|:host|body|html).*\{[\s\S]*?(--grey-bg-color|--dropdown-border-color):" src/
Length of output: 100
Script:
#!/bin/bash
# Let's try a broader search for these CSS variables to find their definitions
rg --type css "(--grey-bg-color|--dropdown-border-color):" src/
# Also search for files that might contain theme or variable definitions
fd -e css -x cat {} \; | grep -A 5 ":root"
Length of output: 641
border-radius: 10px; | ||
padding: 5px; | ||
} | ||
|
||
.calendar__header { | ||
display: flex; | ||
margin-bottom: 2rem; | ||
align-items: center; | ||
margin: 0px 10px 0px 10px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix margin property override
The shorthand margin
property is overriding the previously set margin-bottom
, which could cause unexpected layout behavior.
.calendar__header {
display: flex;
- margin-bottom: 2rem;
- margin: 0px 10px 0px 10px;
+ margin: 0px 10px 2rem 10px;
align-items: center;
}
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
margin: 0px 10px 0px 10px; | |
.calendar__header { | |
display: flex; | |
margin: 0px 10px 2rem 10px; | |
align-items: center; | |
} |
🧰 Tools
🪛 Biome (1.9.4)
[error] 14-14: Unexpected shorthand property margin after margin-bottom
(lint/suspicious/noShorthandPropertyOverrides)
run: | | ||
timeout="${HEALTH_CHECK_TIMEOUT:-120}" | ||
echo "Starting health check with ${timeout}s timeout" | ||
while ! nc -z localhost 4321 && [ $timeout -gt 0 ]; do | ||
sleep 1 | ||
timeout=$((timeout-1)) | ||
if [ $((timeout % 10)) -eq 0 ]; then | ||
echo "Still waiting for app to start... ${timeout}s remaining" | ||
fi | ||
done | ||
if [ $timeout -eq 0 ]; then | ||
echo "Timeout waiting for application to start" | ||
echo "Container logs:" | ||
docker logs talawa-admin-app-container | ||
exit 1 | ||
fi | ||
echo "Port check passed, verifying health endpoint..." | ||
- name: Stop Docker Container |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix shellcheck issues in health check script.
The health check script has potential globbing and word splitting issues.
- timeout="${HEALTH_CHECK_TIMEOUT:-120}"
+ timeout="${HEALTH_CHECK_TIMEOUT:-120}"
- while ! nc -z localhost 4321 && [ $timeout -gt 0 ]; do
+ while ! nc -z localhost 4321 && [ "$timeout" -gt 0 ]; do
Committable suggestion skipped: line range outside the PR's diff.
🧰 Tools
🪛 actionlint (1.7.4)
380-380: shellcheck reported issue in this script: SC2086:info:3:35: Double quote to prevent globbing and word splitting
(shellcheck)
380-380: shellcheck reported issue in this script: SC2086:info:10:6: Double quote to prevent globbing and word splitting
(shellcheck)
````bash | ||
docker build -t talawa-admin . | ||
```bash |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix code block formatting.
The code blocks have incorrect formatting with extra backticks.
-````bash
+```bash
docker build -t talawa-admin .
-```bash
+```
-```bash
+```bash
docker run -p 4321:4321 talawa-admin
-```bash
+```
Also applies to: 158-160
--delete-button-bg: #f8d6dc; | ||
--delete-button-color: #ff4d4f; | ||
--search-button-bg: #a8c7fa; | ||
--search-button-border: #555555; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Enhance button state colors for accessibility
The button colors need better contrast ratios for accessibility:
- --delete-button-bg: #f8d6dc;
- --delete-button-color: #ff4d4f;
- --search-button-bg: #a8c7fa;
- --search-button-border: #555555;
+ /* Interactive Element Colors - WCAG 2.1 AA Compliant */
+ --delete-button-bg: hsl(350, 82%, 90%);
+ --delete-button-color: hsl(359, 100%, 35%); /* Contrast 4.5:1 */
+ --search-button-bg: hsl(217, 90%, 82%);
+ --search-button-border: hsl(0, 0%, 33%); /* Contrast 4.5:1 */
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
--delete-button-bg: #f8d6dc; | |
--delete-button-color: #ff4d4f; | |
--search-button-bg: #a8c7fa; | |
--search-button-border: #555555; | |
/* Interactive Element Colors - WCAG 2.1 AA Compliant */ | |
--delete-button-bg: hsl(350, 82%, 90%); | |
--delete-button-color: hsl(359, 100%, 35%); /* Contrast 4.5:1 */ | |
--search-button-bg: hsl(217, 90%, 82%); | |
--search-button-border: hsl(0, 0%, 33%); /* Contrast 4.5:1 */ |
--dropdown-border-color: #555555; | ||
--dropdown-text-color: #555555; | ||
--dropdown-hover-color: #eff1f7; | ||
--grey-bg-color: #eaebef; | ||
--subtle-blue-grey: #7c9beb; | ||
--subtle-blue-grey-hover: #5f7e91; | ||
--modal-width: 670px; | ||
--modal-max-width: 680px; | ||
--input-shadow-color: #dddddd; | ||
--delete-button-bg: #f8d6dc; | ||
--delete-button-color: #ff4d4f; | ||
--search-button-bg: #a8c7fa; | ||
--search-button-border: #555555; | ||
--table-image-size: 50px; | ||
--table-head-bg: var(--bs-primary, blue); | ||
/* Assuming var(--bs-primary) is defined elsewhere */ | ||
--table-head-color: white; | ||
--table-header-color: var(--bs-greyish-black, black); | ||
--table-head-radius: 20px; | ||
--table-bg-color: #eaebef; | ||
--tablerow-bg-color: #eff1f7; | ||
--row-background: var(--bs-white, white); | ||
--font-size-header: 16px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Review CSS variable naming conventions and color accessibility
The new CSS variables follow good practices but have some areas for improvement:
-
Color Variables:
- Consider using HSL color values instead of hex codes for better color manipulation
- Add color contrast ratios in comments for accessibility documentation
- Consider adding
-light
and-dark
variants for color-blind friendly alternatives
-
Naming Conventions:
- Some variables like
--table-image-size
mix concerns (component/property) - Consider grouping related variables (e.g., all table-related vars together)
- Some variables like
Here's a suggested refactor for better organization and accessibility:
/* Table Variables */
- --table-image-size: 50px;
- --table-head-bg: var(--bs-primary, blue);
- --table-head-color: white;
- --table-header-color: var(--bs-greyish-black, black);
- --table-head-radius: 20px;
- --table-bg-color: #eaebef;
- --tablerow-bg-color: #eff1f7;
+ /* Table Layout */
+ --table-image-size: 50px;
+ --table-border-radius: 20px;
+
+ /* Table Colors - With contrast ratios */
+ --table-head-bg: hsl(211, 100%, 50%); /* Contrast: 4.5:1 */
+ --table-head-color: hsl(0, 0%, 100%); /* Contrast: 7:1 */
+ --table-header-color: hsl(0, 0%, 20%); /* Contrast: 4.8:1 */
+ --table-bg-color: hsl(228, 23%, 92%); /* Contrast: 3.5:1 */
+ --table-row-bg-color: hsl(228, 33%, 95%); /* Contrast: 3.2:1 */
+
+ /* Color-blind friendly alternatives */
+ --table-head-bg-deuteranopia: hsl(45, 100%, 50%);
Committable suggestion skipped: line range outside the PR's diff.
💡 Codebase verification
Based on the extensive color usage scan results, I can now provide a final assessment of the color accessibility concerns:
Color contrast issues detected that may impact color-blind users
Several potential accessibility issues found in the color definitions:
-
Critical contrast concerns:
- Text colors using #707070 on white backgrounds don't meet WCAG AA standards for normal text
- Interactive elements using #31bb6b (primary green) lack sufficient contrast with white backgrounds
- Subtle text colors like #969696 and #737373 fail minimum contrast requirements
-
Problematic color combinations:
- The success state green (#31bb6b) and warning yellow (#febc59) may be indistinguishable for deuteranopia users
- Subtle state changes using shades of gray (#f7f7f7, #f2f2f2) lack sufficient contrast
- Alert/error states using #dc3545 may not be perceivable for protanopia users
Recommendations:
- Increase contrast of text colors to meet WCAG AA minimum of 4.5:1
- Add non-color indicators for important state changes
- Consider using patterns or icons alongside color coding
- Implement a high contrast theme option
🔗 Analysis chain
Verify color accessibility for color-blind users
Let's verify the color contrast ratios and accessibility for color-blind users:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check color contrast ratios using WCAG guidelines
# Search for color definitions in CSS files
echo "Searching for color definitions..."
rg --type css '(#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3}|rgb[a]?\(.*\)|hsl[a]?\(.*\))'
# Search for Bootstrap color variable usage
echo "Checking Bootstrap color variable usage..."
rg --type css 'var\(--bs-.*\)'
# Look for any hardcoded colors that might need to be converted to variables
echo "Finding hardcoded colors..."
rg --type css '(color|background-color|border-color):\s*(#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})'
Length of output: 92260
What kind of change does this PR introduce?
refactoring
Issue Number:
Fixes #2513
Did you add tests for your changes?
No
Snapshots/Videos:
After Refactoring:
If relevant, did you update the documentation?
Not relavant
Summary
The goal is to convert the CSS file in this subdirectory and all the components related to this screen to use this new design pattern.
Does this PR introduce a breaking change?
No
Other information
Have you read the contributing guide?
Yes
Summary by CodeRabbit
Release Notes
New Features
Improvements
Bug Fixes
Chores